From: Keir Fraser <keir@xensource.com>
Date: Fri, 28 Sep 2007 14:05:11 +0000 (+0100)
Subject: xsm:acm: fix a null dereference bug.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~5
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=12e4a926c873db51536a3eecc0afea95a738c941;p=xen.git

xsm:acm: fix a null dereference bug.
Signed-off-by: George Coker <gscoker@alpha.ncsc.mil>
---

diff --git a/xen/include/xsm/acm/acm_hooks.h b/xen/include/xsm/acm/acm_hooks.h
index 54bd15e2a0..bb6ed02c31 100644
--- a/xen/include/xsm/acm/acm_hooks.h
+++ b/xen/include/xsm/acm/acm_hooks.h
@@ -284,17 +284,12 @@ static inline int acm_domain_create(struct domain *d, ssidref_t ssidref)
     } else if ((acm_secondary_ops->domain_create != NULL) &&
                 acm_secondary_ops->domain_create(subject_ssid, ssidref,
                                                  domid)) {
-        /* roll-back primary */
-        if (acm_primary_ops->domain_destroy != NULL)
-            acm_primary_ops->domain_destroy(d->ssid, d);
         rc = ACM_ACCESS_DENIED;
     }
 
     if ( rc == ACM_OK )
     {
         acm_domain_ssid_onto_list(d->ssid);
-    } else {
-        acm_free_domain_ssid(d->ssid);
     }
 
 error_out: